Skip to content

feat(metrics): [Trace Metrics 16] Only send user attributes if sendDefaultPii is true #4995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
adinauer wants to merge 1 commit into
base: 12-19-android_metrics_batch_processor_and_factory
Choose a base branch
from
Open

feat(metrics): [Trace Metrics 16] Only send user attributes if sendDefaultPii is true #4995

adinauer wants to merge 1 commit into from
+3 −1

Conversation

@adinauer
Copy link
Member

@adinauer adinauer commented Dec 22, 2025

📜 Description

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

  • I added GH Issue ID & Linear ID
  • I added tests to verify the changes.
  • No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
  • I updated the docs if needed.
  • I updated the wizard if needed.
  • Review from the native team if needed.
  • No breaking change or entry added to the changelog.
  • No breaking change for hybrid SDKs or communicated to hybrid SDKs.

🔮 Next steps

This was referenced Dec 22, 2025
Draft
Draft
Draft
Draft
Draft
Draft
Draft
Draft
Draft
Draft
Draft
Draft
Draft
Draft
@adinauer Graphite App
Copy link
Member Author

adinauer commented Dec 22, 2025 •
edited
Loading

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

This stack of pull requests is managed by Graphite. Learn more about stacking.

@adinauer adinauer mentioned this pull request Dec 22, 2025
Draft
8 tasks
@github-actions
Copy link
Contributor

github-actions bot commented Dec 22, 2025 •
edited
Loading

Fails
🚫 Please consider adding a changelog entry for the next release.
Messages
📖 Do not forget to update Sentry-docs with your feature once the pull request gets approved.

Instructions and example for changelog

Please add an entry to CHANGELOG.md to the "Unreleased" section. Make sure the entry includes this PR's number.

Example:

## Unreleased

### Features

- [Trace Metrics 16] Only send user attributes if sendDefaultPii is true ([#4995](https://github.com/getsentry/sentry-java/pull/4995))

If none of the above apply, you can opt out of this check by adding #skip-changelog to the PR description or adding a skip-changelog label.

Generated by 🚫 dangerJS against 6cdbfb7

@adinauer adinauer changed the title Only send user attributes if sendDefaultPii is true feat(metrics): [Trace Metrics 16] Only send user attributes if sendDefaultPii is true Dec 22, 2025
@adinauer adinauer marked this pull request as ready for review December 22, 2025 12:59
sentry[bot]
sentry bot reviewed Dec 22, 2025
View reviewed changes
sentry/src/main/java/io/sentry/metrics/MetricsApi.java
Comment on lines +234 to +236
if (scopes.getOptions().isSendDefaultPii()) {
setUser(attributes);
}

This comment was marked as outdated.

Sign in to view

@adinauer adinauer force-pushed the 12-22-only_send_user_attributes_if_senddefaultpii_is_true branch from 106a66c to 6cdbfb7 Compare December 22, 2025 13:41
@adinauer adinauer force-pushed the 12-19-android_metrics_batch_processor_and_factory branch from c3c0f3b to 0116a6b Compare December 22, 2025 13:41
@github-actions
Copy link
Contributor

github-actions bot commented Dec 22, 2025

Performance metrics 🚀

  Plain With Sentry Diff
Startup time 301.24 ms 360.51 ms 59.27 ms
Size 1.58 MiB 2.13 MiB 560.97 KiB

markushi
markushi approved these changes Jan 8, 2026
View reviewed changes
sentry/src/main/java/io/sentry/metrics/MetricsApi.java
"sentry.release", new SentryLogEventAttributeValue(SentryAttributeType.STRING, release));
}

if (Platform.isJvm()) {
Copy link
Member

@markushi markushi Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be guarded by sendDefaultPii as well?

Copy link
Member Author

@adinauer adinauer Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will check

Copy link
Member Author

@adinauer adinauer Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't able to find a sendDefaultPii check for server name in other places and there's a dedicated option (isAttachServerName) for this too. So this seems to align with what we do in other places.

sentry/src/main/java/io/sentry/metrics/MetricsApi.java

setUser(attributes);
if (scopes.getOptions().isSendDefaultPii()) {
setUser(attributes);
Copy link
Member

@markushi markushi Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least on Android [we always seem to at least set the installation id] when no user is manually set, (

sentry-java/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java

Lines 168 to 173 in 3258517

if (user.getId() == null) {
user.setId(options.getRuntimeManager().runWithRelaxedPolicy(() -> Installation.id(context)));
}
if (user.getIpAddress() == null && options.isSendDefaultPii()) {
user.setIpAddress(IpAddressUtils.DEFAULT_IP_ADDRESS);
}
), regardless of sendDefaultPii.
Doesn't need to be addressed here, but maybe worth talking about (also affects logs).

This was referenced Jan 8, 2026
Open
Draft
This was referenced Jan 8, 2026
Draft
Draft
Draft
Draft
Draft
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@markushi markushi markushi approved these changes

@romtsn romtsn Awaiting requested review from romtsn romtsn is a code owner

@lcian lcian Awaiting requested review from lcian lcian is a code owner

+1 more reviewer

@sentry sentry[bot] sentry[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@adinauer @markushi